From: Keir Fraser <keir.fraser@citrix.com>
Date: Mon, 11 Feb 2008 10:01:42 +0000 (+0000)
Subject: ioemu stubdom: make TPM optional
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14317^2~58
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=b108e290094d61a8fc3fdd5d131cc3a523ad1eb2;p=xen.git

ioemu stubdom: make TPM optional
Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>
---

diff --git a/tools/ioemu/Makefile.target b/tools/ioemu/Makefile.target
index ebd691b5f0..2b1bc6bb13 100644
--- a/tools/ioemu/Makefile.target
+++ b/tools/ioemu/Makefile.target
@@ -420,6 +420,7 @@ VL_OBJS+= xen_machine_pv.o
 VL_OBJS+= xenfb.o
 VL_OBJS+= xen_console.o
 VL_OBJS+= tpm_tis.o
+CPPFLAGS += -DHAS_TPM
 CPPFLAGS += -DHAS_AUDIO
 endif
 ifeq ($(TARGET_BASE_ARCH), ppc)
diff --git a/tools/ioemu/hw/pc.c b/tools/ioemu/hw/pc.c
index 5d982016a6..430d932942 100644
--- a/tools/ioemu/hw/pc.c
+++ b/tools/ioemu/hw/pc.c
@@ -1013,8 +1013,10 @@ static void pc_init1(uint64_t ram_size, int vga_ram_size, char *boot_device,
         }
     }
 
+#ifdef HAS_TPM
     if (has_tpm_device())
         tpm_tis_init(&pic_set_irq_new, isa_pic, 11);
+#endif
 
     kbd_init();
     DMA_init(0);